Skip to content

Make MS2 codepaths supply fieldMap for Sort.getOrderByClause()#894

Merged
labkey-matthewb merged 2 commits intodevelopfrom
fb_getOrderByClauseUnchecked
Jun 11, 2025
Merged

Make MS2 codepaths supply fieldMap for Sort.getOrderByClause()#894
labkey-matthewb merged 2 commits intodevelopfrom
fb_getOrderByClauseUnchecked

Conversation

@labkey-matthewb
Copy link
Contributor

Rationale

Fix MS2 tests

Related Pull Requests

Changes

@labkey-jeckels
Copy link
Contributor

@labkey-matthewb check out the changes I pushed to this and the platform FB. One MS2 usage was dead code. I hacked up the map for the other one.

FieldKey fk = FieldKey.fromParts(name);
BaseColumnInfo col = new BaseColumnInfo(fk, JdbcType.VARCHAR);
col.setSortFieldKeys(Collections.singletonList(fk));
col.setAlias(MS2Manager.getSqlDialect().makeDatabaseIdentifier(name));
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since names are mixed-case, we just have to make sure our usages are consistent. But it would be obvious if there were a problem.

@labkey-jeckels labkey-jeckels changed the title Reinstate unchecked version of Sort.getOrderByClause() to fix MS2 sql generation Make MS2 codepaths supply fieldMap for Sort.getOrderByClause() Jun 11, 2025
@labkey-matthewb labkey-matthewb merged commit ae08482 into develop Jun 11, 2025
8 checks passed
@labkey-matthewb labkey-matthewb deleted the fb_getOrderByClauseUnchecked branch June 11, 2025 17:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants